projects / cargo.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8c60ada e3b7f2f)
Auto merge of #2484 - alexcrichton:fix-bad-backtrack, r=brson
authorbors <bors@rust-lang.org>
Thu, 17 Mar 2016 00:50:37 +0000 (17:50 -0700)
committerbors <bors@rust-lang.org>
Thu, 17 Mar 2016 00:50:37 +0000 (17:50 -0700)
commit0493b49546d6ec2e00c765742786a8620edc5e8b
treea0188ae12f39b5688acd198ec3c48b83511ad03dtree | snapshot
parent8c60ada19463fd17cf9eb853bc9cc71cf2737267commit | diff
parente3b7f2f57d13e6626b5f3fbf40bbb1efd928d92bcommit | diff
Auto merge of #2484 - alexcrichton:fix-bad-backtrack, r=brson

Fix caching features across backtracking

In the local loop during resolution all variables need to be reset whenever we
backtrack up a frame, but currently the `method` and `features` set are
accidentally not reset whenever we backtrack. Calculate the `method` later and
cache `features` in each frame so we can properly backtrack.

Closes #2472
Unnamed repository; edit this file 'description' to name the repository.